[CALCITE-7772] ModelHandler.addFunctions should defer UDF class initialization until after shape validation - #5255
Merged
Merged
Conversation
mihaibudiu
reviewed
Sep 11, 2026
mihaibudiu
approved these changes
Sep 14, 2026
…alization until after shape validation
rubenada
force-pushed
the
CALCITE-7772
branch
from
September 14, 2026 17:23
80c675b to
3e20312
Compare
|
rubenada
added
the
LGTM-will-merge-soon
Contributor
Author
|
Thanks @mihaibudiu for the review! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Jira Link
CALCITE-7772
Changes Proposed
Minor improvement.
ModelHandler.addFunctions(...)currently loads the UDF class (already controlled by a ClassNameFilter allowlist/denylist) named in the model with the single-argumentClass.forName(className), which usesinitialize=true. Only after the class object is returned do the shape-check helpers (TableFunctionImpl.create,TableMacroImpl.create,ScalarFunctionImpl.create/functions,AggregateFunctionImpl.create) decide whether the class is usable as a function, and if none of them accepts it,addFunctionsthrows"Not a valid function class: ..."at the end of the method. That ordering means the class's static initializer runs even when the class turns out to be the wrong shape, which can be avoided. This will keep allowlist guarantee at "these classes may be used as functions", not "these classes' static initializers may be run at will".